Enhancement, add SoT blocks to one point cutscene skip#6848
Enhancement, add SoT blocks to one point cutscene skip#6848djevangelia wants to merge 3 commits into
Conversation
| ObjTimeblock_SpawnDemoEffect(this, play); | ||
| this->demoEffectTimer = 160; | ||
|
|
||
| // Possibly points the camera to this actor |
There was a problem hiding this comment.
There was a problem hiding this comment.
It's several years old, from before OnePointCutscene_Attention was named, so it's rather it just hasn't been removed since search-and-replacing the function and should be removed in decomp. But with the merge rate right now it's not realistic to get that in for months... I can re-add it to keep consistency with decomp.
|
The test spot I use to test this (as it's most affected by it), the 4 beamos to SoT room in MQ spirit, still has Link frozen in place in a one-point until a few seconds after the melody ends, while usually link gets control back a few seconds before. Additionally, playing SoT for the windmill/Dampe race blocks with all skips on seems to trigger windmill man giving the player song of storms even though the player is nowhere near him. strangly this only happens if you are on the dampe race side of the blocks. |
|
Thanks for testing!
|
Removing the skip on the windmill block is fine for now, leave a comment about why for documentation, and we can potentially have the glitch experts look at what's going on later to see if there's a better answer. |
|
During testing of location restriction now I did find out that the cutscene skip is actually completely irrelevant for the Song of Storms learning, it is purely based on whether EnFu is spawned or not. |
Fixes #4703.
The skip does redirect the camera like the cutscene would to prevent disorientation.
https://www.youtube.com/watch?v=RJVqCsatpjg
There's apparently an "alt" type of SoT blocks (certain params on spawn) that have their own action functions. I didn't go looking for them but just added the same skip to their cutscene call.
I tested on SoT blocks in GTG and at Dampe/Windmill. If there are any blocks that need their cutscene retained for some reason it can of course be added.
Build Artifacts